Skip to content

ci: freebsd job enhancements#172

Merged
tonistiigi merged 4 commits intotonistiigi:masterfrom
crazy-max:ci-fix-freebsd
Feb 7, 2024
Merged

ci: freebsd job enhancements#172
tonistiigi merged 4 commits intotonistiigi:masterfrom
crazy-max:ci-fix-freebsd

Conversation

@crazy-max
Copy link
Copy Markdown
Collaborator

@crazy-max crazy-max commented Jan 5, 2024 •
edited
Loading

@crazy-max crazy-max force-pushed the ci-fix-freebsd branch 2 times, most recently from dacb6ad to 0a63f05 Compare January 5, 2024 15:53
@crazy-max
Copy link
Copy Markdown
Collaborator Author

crazy-max commented Jan 5, 2024

This test failing is really odd: https://github.com/tonistiigi/fsutil/actions/runs/7423884290/job/20202299898?pr=172#step:7:1047

     fbsd_13_2: === RUN   TestStat
    fbsd_13_2:     stat_test.go:49:
    fbsd_13_2:         	Error Trace:	/vagrant/stat_test.go:49
    fbsd_13_2:         	Error:      	Not equal:
    fbsd_13_2:         	            	expected: &types.Stat{state:impl.MessageState{NoUnkeyedLiterals:pragma.NoUnkeyedLiterals{}, DoNotCompare:pragma.DoNotCompare{}, DoNotCopy:pragma.DoNotCopy{}, atomicMessageInfo:(*impl.MessageInfo)(nil)}, sizeCache:0, unknownFields:[]uint8(nil), Path:"dd", Mode:0x80001ff, Uid:0x0, Gid:0x0, Size:6, ModTime:0, Linkname:"../../", Devmajor:0, Devminor:0, Xattrs:map[string][]uint8(nil)}
    fbsd_13_2:         	            	actual  : &types.Stat{state:impl.MessageState{NoUnkeyedLiterals:pragma.NoUnkeyedLiterals{}, DoNotCompare:pragma.DoNotCompare{}, DoNotCopy:pragma.DoNotCopy{}, atomicMessageInfo:(*impl.MessageInfo)(nil)}, sizeCache:0, unknownFields:[]uint8(nil), Path:"dd", Mode:0x80001ed, Uid:0x0, Gid:0x0, Size:6, ModTime:0, Linkname:"../../", Devmajor:3886, Devminor:188974, Xattrs:map[string][]uint8(nil)}
    fbsd_13_2: 
    fbsd_13_2:         	            	Diff:
    fbsd_13_2:         	            	--- Expected
    fbsd_13_2:         	            	+++ Actual
    fbsd_13_2:         	            	@@ -13,3 +13,3 @@
    fbsd_13_2:         	            	  Path: (string) (len=2) "dd",
    fbsd_13_2:         	            	- Mode: (uint32) 134218239,
    fbsd_13_2:         	            	+ Mode: (uint32) 134218221,
    fbsd_13_2:         	            	  Uid: (uint32) 0,
    fbsd_13_2:         	            	@@ -19,4 +19,4 @@
    fbsd_13_2:         	            	  Linkname: (string) (len=6) "../../",
    fbsd_13_2:         	            	- Devmajor: (int64) 0,
    fbsd_13_2:         	            	- Devminor: (int64) 0,
    fbsd_13_2:         	            	+ Devmajor: (int64) 3886,
    fbsd_13_2:         	            	+ Devminor: (int64) 188974,
    fbsd_13_2:         	            	  Xattrs: (map[string][]uint8) <nil>

Could it be linked to macos-13 runner? cc @akhramov

@akhramov
Copy link
Copy Markdown
Contributor

akhramov commented Jan 5, 2024

fsutil/receive_test.go

Lines 511 to 513 in 797bd68

// Unlike Linux, on FreeBSD's stat() call returns -1 in st_rdev for regular files
ss.Devminor = 0
ss.Devmajor = 0

it reminds me of this ^. I wonder if the test ever worked.

@crazy-max crazy-max force-pushed the ci-fix-freebsd branch 6 times, most recently from 0abdc84 to 4bad782 Compare January 29, 2024 13:43
@crazy-max
Copy link
Copy Markdown
Collaborator Author

crazy-max commented Jan 29, 2024 •
edited
Loading

it reminds me of this ^. I wonder if the test ever worked.

It looks good on main branch: https://github.com/tonistiigi/fsutil/actions/runs/7369259860/job/20054368194#step:5:19

ok  	github.com/tonistiigi/fsutil	0.370s
?   	github.com/tonistiigi/fsutil/cmd/receive	[no test files]
?   	github.com/tonistiigi/fsutil/cmd/send	[no test files]
?   	github.com/tonistiigi/fsutil/cmd/walk	[no test files]
ok  	github.com/tonistiigi/fsutil/copy	0.046s
?   	github.com/tonistiigi/fsutil/types	[no test files]
?   	github.com/tonistiigi/fsutil/util	[no test files]

@musaprg musaprg mentioned this pull request Jan 30, 2024
Merged
@crazy-max crazy-max force-pushed the ci-fix-freebsd branch 3 times, most recently from fdc908c to 42a0778 Compare February 1, 2024 08:52
@crazy-max crazy-max mentioned this pull request Feb 7, 2024
Merged
@crazy-max
Copy link
Copy Markdown
Collaborator Author

crazy-max commented Feb 7, 2024 •
edited
Loading

fsutil/receive_test.go

Lines 511 to 513 in 797bd68

// Unlike Linux, on FreeBSD's stat() call returns -1 in st_rdev for regular files
ss.Devminor = 0
ss.Devmajor = 0

it reminds me of this ^. I wonder if the test ever worked.

Ok I think I found the issue. Seems to repro only when running through vagrant up 🙄

@crazy-max crazy-max force-pushed the ci-fix-freebsd branch 7 times, most recently from 259090a to 8f84755 Compare February 7, 2024 10:50
@crazy-max crazy-max marked this pull request as ready for review February 7, 2024 11:12
@crazy-max crazy-max requested a review from tonistiigi February 7, 2024 11:13
@crazy-max
chore: run once on vagrant init
9193209 
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max
ci: increase vm boot time to 15m
152fee1 
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max
ci: switch to macos-13 runner for freebsd job
c586cb2 
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max
ci: retry logic for freebsd test step
30180b0 
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@tonistiigi tonistiigi merged commit a7e6995 into tonistiigi:master Feb 7, 2024
@crazy-max crazy-max deleted the ci-fix-freebsd branch February 7, 2024 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tonistiigi tonistiigi tonistiigi approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@crazy-max @akhramov @tonistiigi